dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c3db377 2c1bbee)

author	Glenn Morris <rgm@gnu.org>
	Sun, 30 Dec 2012 18:09:01 +0000 (10:09 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Sun, 30 Dec 2012 18:09:01 +0000 (10:09 -0800)
commit	56a944dff18bde39e321aea2a987cb97a8db96e1
tree	2d6afea76a115ac4356beb3fad60cf27f0fd8154	tree \| snapshot
parent	c3db377551ffaba8b2b82238f8a139932477e4b0	commit \| diff
parent	2c1bbee9f27cbfedb8330dcd7ce825a20890a8da	commit \| diff

Merge from emacs-24; up to r111099

12 files changed:

ChangeLog	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
doc/lispref/ChangeLog	diff1 \|	diff2 \|	blob \| history
etc/NEWS	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp-sh.el	diff1 \|	diff2 \|	blob \| history
lisp/org/ChangeLog	diff1 \|	diff2 \|	blob \| history
msdos/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	diff1 \|	diff2 \|	blob \| history
src/dispextern.h	diff1 \|	diff2 \|	blob \| history
src/xdisp.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.